Build enhancements

Change-Id: I7b0d6caffacb55dea2f950d167978e86a8a575d2