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

Change-Id: Iae91de7c8bc4b14b2be6d99ba2419947215559bd
tree: 4dc73dbab6acb2851f5ad24beb73edb13278a932
  1. tests/