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

Change-Id: I7f14d89da3fee380de7d4e121ec04a7d2852a33e