[automerger skipped] Merge "Fix missed refactor of serial" into pie-vts-dev
am: d4f9ad2c59  -s ours

Change-Id: I2e385b08cf9735f8a9e8600b8051485b09bd18db