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 '24d3945966f06cfdac161fcc542ae4c9f84922e7':
  Fix CTS case   testQueryExternalMiniThumbnails failure