[automerger skipped] Merge pie-vts-dev into master
am: b390ad2d90  -s ours

Change-Id: Ic3dbf530fa4119d7b6dbf10880d64e84272e1d9c