DO NOT MERGE: Merge Oreo MR1 into master am: b15359e4ad  -s ours am: 813958e9a2
am: 3b60d3302b  -s ours

Change-Id: Ie0efc7df13209b9028e2be7fc44ce84cc98aead2