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

* commit '8a199a7562ab9b91e186b4c6fac71e0a84c1bd08':
  Merge "Show volume safety warning for all users" am: 0a51955 am: 6cd66de

Change-Id: I0369926f550614aeaf074c0c970d37407a6593b3