Fix cas build. am: b492526cac am: 56a5be926c
am: 78b88f37d0

Change-Id: Ib95e8636dab42556ed256ded16f532171693eb21