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

Change-Id: Ib0cfd422387bbb28c46116fc0e3c31c40e906350