Fix compile errors after merge. am: 0980701a6b

Original change: undetermined

Change-Id: Ieaa4041838a2286e80788202a90c96f98ec04ae6