Fixes: 133434805 Test: build executes internal tests Change-Id: I688672cec640f0113dc06a19a87c097cda60d180