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

Change-Id: I863483d38be51f8fa22e42d718b3341b1fc8c95a