DO NOT MERGE: Merge Oreo MR1 into master am: 7b017d5a2f  -s ours
am: 2ba6a22abb

Change-Id: Id5dd78948fe46817fdb0c65b2c4dc8d6536f3a37