Merge "Snap for 4726689 from ab6bf6c760aa5a6158b8eb14a20a0b30a6981491 to oreo-mr1-cts-release" into oreo-mr1-cts-release