Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 0cacc03576  -s ours am: b6e5afdd2b
am: b0ed4fc1ba  -s ours

Change-Id: I400da7ed9b49545b3d90bacba90a0990107665c1