DO NOT MERGE: Merge Oreo MR1 into master am: b225691d51  -s ours
am: 74492cc0a6

Change-Id: I94d423dd062b65ec4016ca15e690e83e4159db04