DO NOT MERGE: Merge Oreo MR1 into master
am: 41ee806c7f  -s ours

Change-Id: I9a9a076303fe8e656b4404852eda8c170cb96cc1