Merge "Snap for 4455664 from 18abf9c1f0bde3765d263737a5b1da31fa8aa321 to oreo-vts-release" into oreo-vts-release