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

Change-Id: I50688da9beb48d796bf24da498498643495e5869