am 3fa4f2f8: am 4269bccf: am f3ea35b5: am c9ef435f: am baeb930f: am 19b8f3b2: Merge "Fix bugs regarding Camera Video test" into kitkat-cts-dev automerge: 7951d40

* commit '3fa4f2f8c26e23bf8ba080e28069c5e05c3e7e0b':