[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

Change-Id: I6c2503296ecba421bd2da55ff5f3fbe816df9de4
tree: 428339a2d19b77a6ea2e2934b2a8394b1675c046
  1. tests/