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

Change-Id: Ie0095ff853d560e80f2ae9699606ca865574c23d