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

Change-Id: Icacc9e8cb1b2ca5abc2b5602431b8133505fccc3