Merge changes from topic "mm" into marshmallow-cts-dev am: 2996702607 am: 3f2c592c8d
am: b7279d7562

Change-Id: I1e4f6c9b0a217422b8f9b8a3d031d6f4c5c25592
tree: 8eb76d4b684640d127eefabc4216a17a6adbde81
  1. tests/