am cf894c91: Merge "Fix CTS test. Bug #3345445" into honeycomb

* commit 'cf894c91a9b6c7749c9bb325c9e54336b97df900':
  Fix CTS test. Bug #3345445