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

Change-Id: I4eeea5b3c5bdbc4d0a224446de714ad174034808