Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f223ff4c29  -s ours
am: 5e20696633

Change-Id: Icab8cc78b792fee6fdd761965eac312de68af6ef