Merge changes from topic "am-577c7e51c7294d17a1c29c24e9664b0a" into oreo-mr1-cts-dev
am: 666f941b5a

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