am 88aacb78: am 7bd1fb2e: am 24d39459: am 9a0d27b9: am b812960d: am 4b3c7eaf: am 6861e8d6: am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '88aacb7897c89947f6af2ec54e938978f844b3f6':
  Fix CTS case   testQueryExternalMiniThumbnails failure