Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: df84805752  -s ours
am: 800b2a04ab

Change-Id: If1b589fee0e3e23796a62e763567a2f51aeee50c