am a049492a: am 2f63beb8: am 4aa61f57: am e505721d: am 46af1cb1: am 3f56a153: Merge "Camera2: modified video snapshot test" into lmp-dev

* commit 'a049492a2af9a2844be2c308516c1b205cebfe77':