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

Change-Id: I5b0c812a2c5bb8c2e5fde307f512f3337f1d65b4