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

Change-Id: If1b155be54b49b2f2df56915cedfda2b87c4a1a8