Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 770d6ed9ff  -s ours
am: f86efec220

Change-Id: Id81bd62ac38b067ccc6f767a14e837890838ca45