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

* commit '4b3c7eaf89ae1f89fb65c7bd999011e772d0e208':
  Fix CTS case   testQueryExternalMiniThumbnails failure