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

Change-Id: Ia45f41e59cc2282d8c91341ebce542eb04c4a3d3