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

Change-Id: I7f573813df0910d9098f262742d9b82a4c9908d1