Merge "Fix some WM unit tests" into oc-dev am: 2c93764bee
am: 45d534bf93

Change-Id: Ia81653887fbf9a712d0ed285fa91a0e3afe1bff6