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

Change-Id: Ia43a684ae2e5900ba7052d51b563f46923612527