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

Change-Id: I03ecdfbb20e5b882332e7a018fed9b6969990974
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/