Merge "Snap for 6667372 from f4c22a5117837a1bbef5b0a4339623e33133182e to oreo-mr1-cts-release" into oreo-mr1-cts-release