am 9b9de51d: am 6a1c1372: am 4bc52341: Merge "Fix CTS case testQueryExternalMiniThumbnails failure" into jb-dev * commit '9b9de51d': Fix CTS case testQueryExternalMiniThumbnails failure