Merge "BOARD_USES_PRODUCT_SERVICES_IMAGE => BOARD_USES_PRODUCT_SERVICESIMAGE" am: d5f825c78b am: 7f9ba18e25
am: 4b3fcae2df

Change-Id: Ib70b1f0a0a3479190208c59e0039d53677bad9c1