am dfc6fd38: Fix the CTS build

* commit 'dfc6fd38d35db73eb0273b17da5b557db5d92813':
  Fix the CTS build