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

Change-Id: I7d2d610f3939eac1b271e45ae35457b7b71dc46a