am 258ac169: am 0d053a2e: am 767aa034: am d4880445: am d5f58b0f: 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 autome

* commit '258ac169929a3130998e27adf881d4ab6e858390':