Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 827c2ac0b3  -s ours

Change-Id: I3486a1f849ee37042173d85ad09bd530862c3191