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

Change-Id: Id37c3ae5f707f8677ea5ece9d7a432604eb7dcb4
tree: b200fff2914576bdb3d59836b60e90f4adb0b12b
  1. tests/