am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev automerge: b812960d automerge: 8013ee67 automerge: 4659b161 * commit '4659b161':