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

Change-Id: I83fc43766f88ece92ea6eb13ff7bd5054bc76d39
tree: 146373b019a4908790b019644ebfdd0db18b0aff
  1. tests/