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

Change-Id: I0cb9ad80de731d97d49db09919e3dde76b4bb9ca