Merge "Snap for 4455664 from 5c97d4873d068790cc9b4fed4808fea2935f9b21 to oreo-vts-release" into oreo-vts-release