Fix merge compile errors (1 of 2)

Change-Id: I759bb0991f4e93782fbe4596c57863d9b55d7c21