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

Change-Id: I9568d46577d83225ce161d3b809a4fca1f0852fb