Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 22f3402d64  -s ours
am: 398cceacb3

Change-Id: Ieaffee321567887d504f5ed25a79192f5eb9c6d7