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

Change-Id: Ic20c74e6bcfde684a5daa3405868222d7aabfb1c