Build Fixes

Change-Id: I001fffe239274b23755cb581b122e20e33b71fd5