Fix cas build.
am: b492526cac

Change-Id: Iccf96cba3d84ee71af565ba8bc65a4f54082dbd0