Fix the build
am: 4707e2b64d

Change-Id: Ia23abc1ad1e72b967a0214776a4a9c980a2f805d