am 91dea5ab: (-s ours) am d3e41b16: am df5048bd: Merge "Fixing unit test to not rely on html markup." into jb-mr1.1-dev

* commit '91dea5ab38a2ea9f346f0129a3d222e690dfb6c4':
  Fixing unit test to not rely on html markup.