[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

Change-Id: I8293081120821576357af0be19381165591881ec
tree: 3cfc405f22847ea44743da0c9a343404ecde7883
  1. tests/