Snap for 4455664 from cb79211e8f7b3b771e4b658a116d0c4e67798863 to oreo-vts-release

Change-Id: Ib16442a61b6a7b34250114846cf20132bd529092