Fix cas build. am: b492526cac am: 29ba83e4e7
am: a719dbd43a

Change-Id: Idac5bf44f7fa9f04fee062fd823bb11fd8b59531