Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 866bc4c5d2  -s ours
am: f927ecbf64

Change-Id: Ie9acf76a9bf2ca2575cc304ec150f43377cfa434