Merge changes from topic "am-640962a57b8e46aa8b753bca730fb376" into oreo-mr1-cts-dev am: 9f63146b7d
am: 57c33efafb

Change-Id: I0052415fbe328359af57f616bbe8476af6a6c853
tree: 707c36f79dc5fd1297e2f970ac6d9f6c5a33e571
  1. tests/