DO NOT MERGE - Fix build
am: bf835e4525

Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e