Merge changes from topic "m" into oreo-cts-dev
am: f40fcd461a

Change-Id: I94fd78a459738c16a7aa25425eacef5a4bda4de6
tree: f053791b2ab65c58895d16b53dad660248e0a11b
  1. tests/