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

Change-Id: Ic60a1b9805c214454e558b729606f861e56d5a87