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

Change-Id: I4d98c75e6b9c037f04a9f6b87a78bd63b4bb3bf8