Merge "Include UUID in MediaStore version."