am b62af0bb: am 3c5e3de7: am c2822aa2: am 4659b161: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6

* commit 'b62af0bb4a52d8e4e589803a25f118ea033867e7':