am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960 automerge: 8013ee6 automerge: 4659b16
automerge: 8d6ba40

* commit '8d6ba405078e54640f624e4fe60ef78e20172d20':