Fix build issues after the merge

Change-Id: Ia856311187a0b2168cb859bd8b2300ff59df6569
2 files changed