DO NOT MERGE: Merge Oreo MR1 into master am: a5d45aa1dd  -s ours
am: d10f572af0

Change-Id: I43324aefa900fe2a70aec620ab22b9b5b0737e36