Merge "Reset isValuePreservedInRestore in Setting::reset()" into rvc-dev am: c6947ef6 am: 83974911 Change-Id: Ie7ecb91d9d27791d3ecb57a86f1042c1c7152945