Merge \"Make advanced storage option sticky...\" into nyc-dev
am: 361ccf5eef

Change-Id: I2369ba044813d2392a73ab369c012f1eb0ef51e8