am 248dcdf0: Merge "Fix a test."

* commit '248dcdf0eb69903368b3c2bf0e9eda574d1ebf9e':
  Fix a test.