am 82372b87: Merge "Part of fix for bug 8629392: CTS test failures" into jb-mr2-dev

* commit '82372b873eafd49fbf54e95deb5cf824e3d4223f':
  Part of fix for bug 8629392: CTS test failures