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

Change-Id: I0d7963e307591612e6ab47bff27b49f8f6a1dd2f