am bf310d1f: Merge "Fix issues shown on CTS tests" into jb-mr1-dev

* commit 'bf310d1f6ef4ac167f66a4e31724c7766981bd84':
  Fix issues shown on CTS tests