Fix cas build.
am: b492526cac

Change-Id: Ic422b97c13793ff4a335530e79e906c79739557c