DO NOT MERGE: Merge Oreo MR1 into master am: 2df16423fc  -s ours
am: 06fcf6acc8

Change-Id: Id201662759943f7eea92538a45bf87723cca459e