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

Change-Id: I57a4d20eead0e0122c9e9044599c8dd560957984