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

Change-Id: Id6b138f5fd98da7d63aebb6b92182de06cfcbbd7