Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 9c56330ccc  -s ours
am: 618e8bac79

Change-Id: I3c3a79299d5f59d20d85d1293cea4992ed01d720