Fix cas build. am: b492526cac
am: 56a5be926c

Change-Id: If4bca923be3d8d664dce83d96eb8597c1930d6bb