Merge "Re-hide ApplicationInfo.volumeUuid."