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

Change-Id: I4fe11f706ac257fb36dd6c4fb53a0eb8be364386