[automerger skipped] Merge changes Ia3b96e83,I80d924cc into pie-vts-dev am: 0b1461687f  -s ours
am: edc6e366c3  -s ours

Change-Id: I46f1649944e3669b276287fe98d5b7acbe23b997