Merge "Fix issue with RawMonitorWait."
am: 66bfa47fd2

Change-Id: Ia96937c5fc5139a9d2d4d4fd088229f27e781c44