Merge "Fix SettingsProto corruption" into qt-dev am: ffd354d6a4
am: 589738054e

Change-Id: I9a898370732f797155729bd883a79feda0fa14df