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

Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816