Merge "Snap for 4711598 from 47a82ba91ff281a8afe975f03eba2acb9b1bb74c to oreo-mr1-vts-release" into oreo-mr1-vts-release