[automerger] Merge changes from topic "asb-2018-04-n1" into nougat-mr1-cts-dev am: 34ef78f44f am: f727768aa7 am: b5c3ab95a8 am: efcf101cf2

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