Fix latest merge issues

Change-Id: I0f7d3acded061852ba5d1c1c376968cbbaea4ac9