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

Change-Id: Idfd09b51bfc95812dc57413f8e5da0d785129ea7