Snap for 4455664 from c728d76e09bea3fa6779267d919fdd44703e746e to oreo-vts-release

Change-Id: I1deae3bdc06f3896037f5fc5fc1ee120bc8f180a