am f3747b9b: am e1f33337: am 941a7cd3: Merge "Camera3: Fix Aberration mode naming" into lmp-dev

* commit 'f3747b9b53c6d57010a6b37dd992e0c7306ba8a5':