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

Change-Id: Id1db84722cbabaa0cc62a094eb9ed398aabbc2e2