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

Change-Id: I8a2912ea0ea9fc396f3d6513db7c466f5cdec0c5