DO NOT MERGE: Merge Oreo MR1 into master am: 31ccc08192  -s ours
am: 9bc36c5df3

Change-Id: I76659a0a943486b9b81d149c7fa698ca359cf923