Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: b189caf1d7  -s ours
am: 3cbf7f0729

Change-Id: Ic5973d8040286eb1bb988986dd1ee15cd6eec818