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

Change-Id: I5188161ad796711e7336486751f50bf751d77933