Merge "Preserve options on remount in commitChanges"
am: aaac873faf

Change-Id: Ie09902ef6111cf2aa57014cb97dcdcbe04ecaf86