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

Change-Id: I7b02dec52764e919081b9d0120ec4c8612b00ded