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

Change-Id: Id2d1dd852e99e10eb0d207fb98f9ecb317df1831