DO NOT MERGE: Merge Oreo MR1 into master am: 65fe39d8b0  -s ours am: 10cd87412e
am: c929a32dbc  -s ours

Change-Id: Ie1582296cee606a2a5bbf8187d8fb271e6b5948e