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

* commit 'cd731ca7e432630b8e8645e4dff04faf0ac5d5af':
  Add some more uninterruptible annotations