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

Change-Id: I6ff315a6e309be8781c9d21aa24555b7fa600125
tree: e5f80f1c4246d14fb520cb677b261d5e47acc301
  1. tests/