DO NOT MERGE: Merge Oreo MR1 into master am: e4026a6732  -s ours
am: 930d43c8df

Change-Id: Idf265cc879bf9246ab3b474b46a1362485fc2440