DO NOT MERGE: Merge Oreo MR1 into master am: d1d08805b9  -s ours
am: 47ca98472f

Change-Id: If63053aa0ce5b579a27d0d1eeb29b5797ac89959