DO NOT MERGE: Merge Oreo MR1 into master am: 03f7102740 -s ours am: aaa36187f8 Change-Id: Ifdeeba1cefe57e029843d5da67e3579cbede2d52