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

Change-Id: Ie37952d805f4376fedf69355037fdb5e485f220a