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

Change-Id: I0aeab0e8855c74c17fdc4de2e2df7247018bd6e3