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