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

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