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

* commit 'b812960d3bf386e07b3f18da92adbb74dd416933':
  Fix CTS case   testQueryExternalMiniThumbnails failure