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