Fix cas build. am: b2ee26784b
am: cd4627348b

Change-Id: Ic7ef7875c1fb32bcdd02fa661ab549afb75b24b9