DO NOT MERGE: Merge Oreo MR1 into master
am: c94be06aa0  -s ours

Change-Id: Id677aed5852fac55df057a2ed6e92b8c66bc1115