Fix the build am: 4707e2b64d
am: 7815035df0

Change-Id: If3c7dc7dc7c7a3a9f3ebf07f88a74d4a89e8c940