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

Change-Id: I38fd6c558d53cc81b827bf220d7fe1d3ba65ef97