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