DO NOT MERGE: Merge Oreo MR1 into master

Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I49a85024e1c5f614ccf806aab672a672cf8b4d41