am e8d088ed: (-s ours) am 22c1871d: Merge "DO NOT MERGE - remove dns test from MR2" into jb-mr2-dev

* commit 'e8d088ed2dc3ac653bc13bebffdea4a5cb0fad3f':
  DO NOT MERGE - remove dns test from MR2