Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d59157b919  -s ours
am: 90c3332f39

Change-Id: Ifa1acbe1deacceb2f2383434bd06e6943711f223