Merge change Id8a539c6

* changes:
  Suppressing an invalid test that's checking implementation details.