Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f0d0a01dc2  -s ours
am: fe550a168b

Change-Id: Id8a9f2d934aecc8f410dddb9c14af861b5c9ada7