[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

Change-Id: I80cce468813cad4e8cbd49e8971e38be03440784
tree: 60d198c6bc42d67433853e97c225e2af7a0ad4bc
  1. tests/