Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: ba99b11181  -s ours am: 82904944c8
am: 7f31cd05e2  -s ours

Change-Id: I4002dd15e2d424ac0ab7fb4eef986f6b5e2c102a