Merge "Move WAPPushManager to /product"