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

Change-Id: I0f232d19880cb439862470fe03f19139c55c19fa