Fix build. am: 674b3ad5a6 am: ac0e1ec95a
am: a5ff9d1128

Change-Id: Ia7ffc8d5ff5b6cd2b4a34f7d6444111383ad0e08