DO NOT MERGE: Merge Oreo MR1 into master am: b15359e4ad  -s ours
am: 813958e9a2

Change-Id: Ib67896eb7ea32053b92b40489b55bd0586ce5070