Manual merge of changes to fix build

Change-Id: I6d3fc05affd34ff620393ac40c2b8974a7b8ce0b