Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 4ff40ccbfd  -s ours
am: 690dbecf8a

Change-Id: I0207a73da9654528f18aa45aa196d47f1b8846e3