Merge "Merge "Show volume safety warning for all users" am: 0a51955 am: 6cd66de" into nyc-dev