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