Merge "Fix MonitorContendedEntered test." am: 91a2252422 am: 51b8314166
am: 2691c71170

Change-Id: If70de0d65b0016cbe3e8e1a6209079a710b628bd