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

Change-Id: I1badabd184e729031a7279cbc31c5c4c6449d591
tree: 4b52b3db297b78c2c6547af0730d92e6f6ef1987
  1. tests/