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