Snap for 4455664 from 07614c775a21d442106856cf8937f6243ab9171e to oreo-vts-release

Change-Id: Ifaf97929b29063d8f474843ac421d1ed2ec9a9ba