Merge "Improve MediaStore CloudMediaProvider (CMP) APIs"