Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: dedff1ece6  -s ours am: 70f12c5582
am: a3a6bfbf77  -s ours

Change-Id: I10208fad3a37aa9a906c9df05b6eb9f57d3af05c