Snap for 4526935 from fe29ba7a9c86bf37b24f9dcf6e765978bc5a9dd0 to oreo-mr1-cts-release

Change-Id: Ib99dfd95d91fd2a3c3fb1ad5c1c1fdd2350f3b2d