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

* commit '5cef9f8f3ff26dc91f31ce1c3c1543df64ea1eba':