DO NOT MERGE: Merge Oreo MR1 into master am: 4774dc09fd  -s ours
am: 8a9f33b8a7

Change-Id: I6094090377475869d6af43106d377eba92e253a3