DO NOT MERGE: Merge Oreo MR1 into master am: 02ea09bf2a  -s ours
am: 1eda54bca8

Change-Id: I5ce9f2fd322e4be55a120d6de265626d7ba9f2c9