Snap for 4726689 from 833770d26f7813768e195d22ca9c8e41dc83448a to oreo-mr1-cts-release

Change-Id: Id2fe641eab1effaec4ad4f354449d2e018961a1b