Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 770d6ed9ff  -s ours am: f86efec220
am: d6055b89a0  -s ours

Change-Id: Ic890106c18378584081b9209ae261dab6726438c