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

Change-Id: I397c61a8af4ad0bbac8d29f228345acef1d5f251