Merge "Snap for 4379964 from a60ab7478aa26d5514e2cac525063ec720828700 to oreo-cts-release" into oreo-cts-release