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

Change-Id: Ia4649ee11ed19aa42c92d96c3b52d8ede94ac4fe