DO NOT MERGE: Merge Oreo MR1 into master am: a1199fd809  -s ours
am: 3d4ed8f879

Change-Id: I4dfeffd968607bad6a9658af5189b20dca1f2ad3