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

Change-Id: I86e87ad5a5f1a5603a4c3e04a687e2e3f6815f2d