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