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

Change-Id: Ifcef103b42a92614db1a5d77951f6bf027b92478