Merge "Use ApplicationInfo.storageUuid"