Merge "Do not clear data for WAPPushManager settings" am: f7c2fd6a38 am: 13f0cabda8
am: d39ce65953

Change-Id: I02e8786d9b636fb13767421a3010d618556b646f