am da102f85: Merge "Fix for bug 8629392: Failing cts tests on MR2" into jb-mr2-dev

* commit 'da102f855b9aa03e1f4c589afccf29e94cd4695e':
  Fix for bug 8629392: Failing cts tests on MR2