DO NOT MERGE: Merge Oreo MR1 into master am: 63b0ff1faa  -s ours
am: e78942c195

Change-Id: Ie826c86b6af296e814d7f00b9295964206e9e1e1