Merge "Fix missed refactor of serial" into pi-dev
am: be8beb8c0a

Change-Id: Icf40cdf32ba50131a9a9424189fc36dbb22cdef9