fix build issues

Change-Id: I2fec4902878e9683bae977f9663a4ec1462d4aee
3 files changed