Fix the build after rebase. am: 7fc14e3ea2 am: 882a0146c7 am: 06e165325d

Change-Id: I829fe2f090c62829be0a7ec8a8cc1b49cdba5a1c