Merge changes from topic "am-4267ce935a9849bdbcbcc7e45cbacd34" into oreo-cts-dev
am: 1c90ff8dcf

Change-Id: Ia6a800ccdc908776040c2d9b2a793fbdb2e174fc
tree: 75a10edf72cfba28d92b04107c06e95e30e16732
  1. tests/