DO NOT MERGE: Merge Oreo MR1 into master am: ff84934e0a  -s ours
am: 28188d7e68

Change-Id: I5e7add5627c0dc38b67e6e8f4bee7f5d2f8a5fea