Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: af30cfd60e  -s ours
am: 14bfe7a7bd

Change-Id: Ia97e1d06f72e44b71a9fa9d4464d385ad9ee7224