DO NOT MERGE: Merge Oreo MR1 into master am: 791f9897b6  -s ours
am: dd8164e49f

Change-Id: Id3a994354e5ab80cac3f3a7b0000d64a89e1adc3