[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

Change-Id: Iba19c21dfb4bdeff88c166eb7c34bcdb0fdcc8aa
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/