Merge "Make Storage settings title be "Storage"." into oc-dev am: c7299663e7
am: af1a66202f

Change-Id: I71309f8db92a72df913aa30e4664cabb69b2fcbb