Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 277fc84328  -s ours
am: 9719f84b0d

Change-Id: I174b32841cfa4c3fa898159ab9ec0379e1ba35ba