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

Change-Id: I129ecfd26f52a308b4a2c2ab796168b117a73949