Merge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev
am: 83479600cb

Change-Id: I31c98396c146bfbca1f7a6758abe63ece8cd929d