Build updates

Change-Id: Ia58b670aa5303c6ff57db4910572295b6ac99364