am ec891dde: am 7c8d6957: Merge "camera2-portability: Fix zoom occasionally not working" into lmp-dev * commit 'ec891dde':