[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

Change-Id: Ie003213690a2ac4baf087857a8406abde342b90c
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/