[automerger skipped] Merge "Add dummy WmTests" am: d107ee51d2 am: 3268903a59
am: a92c1c577d  -s ours

Change-Id: I5395efd3595350538f083d5dbba780b91df09c05