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

Change-Id: I9fe0184c6e832499dd44d09dea1a4a43b99cc2f0