DO NOT MERGE: Merge Oreo MR1 into master am: 822ef80cb7  -s ours
am: b3d9dabb65

Change-Id: I7158ffab40c5fec29446915861801a4bbba941cd