Preliminary support for product builds

Change-Id: I2a5e70dda973a6fcdbba0d5e26b35b99d3f1aea2