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

Change-Id: I82dbeb3c131ab4dae79c36c22e9b9e8120b563dc