Merge "Special-case backup/restore of replaced settings" into rvc-dev am: c3a77a143c

Change-Id: Ie8eaa5a6f0d061d00ccc76f211a639a29fee639e