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

Change-Id: Ifff697b20cb2e0c9f89594fe965dde3545447175