DO NOT MERGE: Merge Oreo MR1 into master am: 4a7486f159  -s ours
am: 5088862304

Change-Id: I3b5cc4ebafaf74c11a736ed09454652da1f32d75