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

Change-Id: Ia4e9f1c92e2ddc079af12951b791d4a29be65904