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

Change-Id: I140ccadb48c1efe83cf99b20cadebce2d741d9d8