am 2a7ea34c: Merge "Add some more uninterruptible annotations"

* commit '2a7ea34cda9bf776339dfc7f4a22ab01f9525f2d':
  Add some more uninterruptible annotations