Merge remote-tracking branch oreo-mr1-cts-dev into master.

Test: presubmit
Bug: 69859815
Change-Id: I1ffa3fedf870d2a0cebb6cd8ee5dd7dc5b168fe0