Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 0cacc03576  -s ours
am: b6e5afdd2b

Change-Id: I9c359210dbf4ff8cb4a6a572a0158bd20d076557