DO NOT MERGE: Merge Oreo MR1 into master am: 5364be50cd  -s ours
am: 10a3719386

Change-Id: I5cf1244ca19edc85e07ff8e4b63e0a04f50132b6