[automerger skipped] Fix missed refactor of serial am: 0c3572e2f3
am: abf6bdfa55  -s ours

Change-Id: I211f330c574dcd060926b8d7170f7f359336b7f8