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