Merge "Add dummy WmTests" am: d107ee51d2
am: 3268903a59

Change-Id: I5a3f331faa28648bec62d46cea23d2d33064e5cd