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

Change-Id: I62b39a6a648bc638b5f3ec6236e118783ab81089