Merge "s/PRODUCTSERVICES/PRODUCT_SERVICES/g" am: c0f60b7e4d
am: ce965ed421

Change-Id: Ia193caa441abdc922b063772c573a9ba4a652859