Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: b6d5778700  -s ours
am: 6394d1ed90

Change-Id: I6f2c0c92f7348ce5f12ec0331dd64e766346ba09