manual merge - fix build

Change-Id: I5417fd6ad71fd3cd0520f1fe89921fa01f8a0869