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

Change-Id: I6d9ef80b75c9ac1734f12e677a76c46f68f7db04