DO NOT MERGE: Merge Oreo MR1 into master am: a0d1e67bcc  -s ours
am: 729b466fa6

Change-Id: I3c22e888fe40a83422ea5979b77dd4dedcc60a81