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

Change-Id: Iaa83191117dc7446573c0f427ea4f4d92c79edb5