Merge changes from topic "am-26881935e2b34994a556637dd980465e" into oreo-mr1-cts-dev am: 36407c961d
am: 299f737297

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