am f8509d31: am 5592c688: Merge "Add missing EndAssertNoThreadSuspension"

* commit 'f8509d3192ffd0959b822f31f18089315b873f76':
  Add missing EndAssertNoThreadSuspension