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

* commit 'fb7c14c5f974cad8b74e51cc8fab86c276626780':