DO NOT MERGE: Merge Oreo MR1 into master

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