DO NOT MERGE: Merge Oreo MR1 into master am: a0d1e67bcc -s ours am: 729b466fa6 am: 64cc8a8266 -s ours Change-Id: I8a94a4e1603c9658dfe87ef7f0ed0697d864fe68