Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev
am: 7f0c5e7da8

Change-Id: I1db217fe93ba600f5a732aa8418705f2133af020
tree: e3c17fcbbce93239c7a396489a0984956f82c05e
  1. tests/