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

Change-Id: If7989cfa894c7545ea791dfb5b6288ae59c3c0ba