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

Change-Id: Ibc7ebfa9d5f68014592b4fb8793358be5436efce