[automerger] Merge changes from topic "asb-2018-04-n" into nougat-cts-dev am: 46b33d45f7 am: a2002d1824 am: c53324ff49 am: d599ee0f6c am: 8c4e8c715d am: d23573db37

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