DO NOT MERGE: Merge Oreo MR1 into master

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