Snap for 5042378 from 00d9027e38e8337b2358a06aa7e14840d6a1dfe9 to pie-vts-release

Change-Id: I00ee3b39d93354c930e5b5a5f2a97c70f5309284