DO NOT MERGE: Fix breakages

Change-Id: I8763719aacd879f3a01163ca63ffb1ac02106155
1 file changed