am fb7c14c5: am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd43 * commit 'fb7c14c5':