DO NOT MERGE fix build breakage on k
am: 4e33c4f8b1

Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830