Fix build issues from bad merge

Change-Id: I6ebac7c87b807a8ed2fbeac895c1db8b199f715a
1 file changed