[automerger] Merge changes from topic "asb-2018-04-m" into marshmallow-cts-dev am: 7f0c5e7da8 am: 6d52324524 am: 87ad8f6dcb

Change-Id: I3d0bb181be9a6850c04c414c00caa34357af64c2
tree: 5868c322c1eddcab260ecf3e588d0c348b990888
  1. tests/