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

Change-Id: I95f73d92932ffa352b6299c7bb8d5fe4ec71e023