Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 4ae4b9c66f  -s ours
am: fed4769bc3

Change-Id: I145bfa389a9480603a38856dacc19048dc43766f