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

Change-Id: I61b56946b8f0475a67b97ecd87392dc351b7931a