Merge "Snap for 4455664 from 78f2890124d925dc0bc065f9394f1031cfad5edd to oreo-vts-release" into oreo-vts-release