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

Change-Id: I816e4c524657330551e489e74667ebf1a526f982