Fix build. am: f9ff7e608d am: eb03c7488a am: 6d6ebe4b05
am: 7a013fa32d

Change-Id: Ib3cadfe97f1385acc668e937cf9cf77df54876fd