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

Change-Id: I6c65f29b17ce1bf0f4874d9aee21ad0b1b5f5d69