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

Change-Id: Ia39fa85435347c780403bf111f186a6a00f76d86