Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d18ed49f9d  -s ours
am: 3aafa4c9ce

Change-Id: I0e586f759df230aeff2dd045e5ff1d138d284ec3