am 6a1c1372: am 4bc52341: Merge "Fix CTS case   testQueryExternalMiniThumbnails failure" into jb-dev

* commit '6a1c13721bee123b726e5bccabede571385d1dae':
  Fix CTS case   testQueryExternalMiniThumbnails failure