am cd45d791: am b537618e: am 914d9c23: am ba5c1f66: Merge "Fix CTS test failure"

* commit 'cd45d791e9da02f68f743ff548272236e5636ab5':
  Fix CTS test failure