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

Change-Id: Ieac67d5e0d8aa3ef3ab97173aec14ded4517cb01