Merge "Fix issue with RawMonitors around thread suspension."
am: bf7e6caea5

Change-Id: I307a353fab7504a2adf90925ae8ffdf15db37edb