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

Change-Id: I2ef265cf916e4e6311e5875594691f3b3d64a32c