Merge changes from topic "asb-2018-04-o1" into oreo-mr1-cts-dev am: f5e53a396f
am: b5c3d08260

Change-Id: Id3a47db521327b32843cb68e6ff10b89f0f23828
tree: 80ca5489f3519d96804a56addbea9ee72ff5ec88
  1. tests/