DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours
am: e1ca4cd074  -s ours

Change-Id: Icbb64c652c66c55fcc6e0cf1500af2cfb99fdbb3