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

* commit '27bb29f13838fcdb7536848ab54b9afa2e5c1322':
  fix CTS build problem