am 87f8950b: am 2915d96b: am 325668ae: am aeef3cb2: Merge "Allow some time for recording in testVideoSnapshot" into jb-dev * commit '87f8950b': Allow some time for recording in testVideoSnapshot