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