Merge "Add KM_TAG_ALLOW_WHILE_ON_BODY." am: f704e8a939
am: b9733d9bff

* commit 'b9733d9bff225ae0b16feeb64283b123225af465':
  Add KM_TAG_ALLOW_WHILE_ON_BODY.