Snap for 4455664 from 5ff6360204c3ab4f9637c35dd33cef7104390417 to oreo-vts-release

Change-Id: If90f22a67a1f898dbd0b2cfcfccc1532625772d2