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

Change-Id: I6204de46dd54b2c2a89c9a44edd571179ae1ddab