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

Change-Id: Ibd4785d8efee315c8d524a1a97590fe75801ea78