am 46a51d6b: Merge "Add a test for bug 9087737."

* commit '46a51d6be56424eca5ea76a9d4bf9d9a839d54f2':
  Add a test for bug 9087737.