Merge "Move WAPPushManager to /product" am: b28fac6edd am: 8b5e298f91
am: d16993adee

Change-Id: If4d562271d69fb669fc0b173d2623b7e66f8bfa9