Build fixes

Change-Id: Ice3ad14af0e04a42924dca8a0c029074207b0205