Update from CM to fix build.

Change-Id: Ifeca4ba5f22fadf3fd7b3d2613a89db33f758d9e