Fix the build am: 4707e2b64d am: 7815035df0
am: 5ecb655ac4

Change-Id: Id81fd03e0435f1c039b95fcca2adf86558846399