DO NOT MERGE fix build breakage on k am: 4e33c4f8 am: 07c99401 am: 84f479f6 -s ours am: e1ca4cd0 -s ours am: 0e64d741 Change-Id: I856719a3bec69549b83507fefcd662ce54104eaf