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

Change-Id: I9912a30869c9853221aad816b29ec41d27adc49b