[automerger skipped] Merge changes Ic41afbd0,Ibe264d08 into pie-vts-dev am: e101aa87a3  -s ours
am: e22dd68ccb  -s ours

Change-Id: Ib63e495474c2137f67774466629eabb3ecc383a6