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

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