DO NOT MERGE: Merge Oreo MR1 into master am: 5687e7e6d5  -s ours
am: ffa446bd74

Change-Id: If90ec91554f1198e22f320e6fb34bae1b5217fa0