DO NOT MERGE: fixed breakages

Change-Id: I0753d211421320aca9ce1f26b40aac789a165094
1 file changed