am 35dd75a5: am 08d97f91: fix CTS build problem

* commit '35dd75a5072cdab7cb254e9499ba12f456230808':
  fix CTS build problem