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

Change-Id: Iee422342ed926f0dd9b677f19cb51b40758defde