Merge changes from topic "asb-2018-04-o" into oreo-cts-dev am: 6977a333a5 am: 51fa4a4cc9 am: ee4732c77c
am: 03a6e259da

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