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

Change-Id: If0ed182452c687d3c9cd648e6267aab890a9c31e