Merge "Fix skipping the last address line and avoid appending nulls." into...
Merge "Fix skipping the last address line and avoid appending nulls." into rvc-dev am: a1355716 am: d686afd7 am: 6cff506f am: d0e089df
Change-Id: I5fdf9304a3ddf6c7251797813405ca4b447e885d