[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb am: 70171fe46e am: 6035791a0f am: c0ca2003bc am: c4691f5ad5 am: d27bde6edf am: c5c83b10ac am: 41c0a7b438 am: a11caf34cc am: 10bed1ef52 am: 255cbbc39c
am: 6cc16da2a9

Change-Id: I5f03d8e90b65512d0fae094f819a4609d4f3a246
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/