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

Change-Id: I436ff2104487bec8c513e3badee2e603575057c5