DO NOT MERGE: Merge Oreo MR1 into master am: 3b4a1d7e44  -s ours
am: 534ecbd327

Change-Id: Ia222f029fb804cb6d2bdd48f46063d9d0fca96f4