am 39ee4445: am 7bc855c8: Merge "Add a test for bug 71369"

* commit '39ee4445ce87367c0ced05b19dfe3e3e65e4dd73':
  Add a test for bug 71369