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