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: 0e25cae8 am: 5c84d5fb
Change-Id: I7a3834df6d18f4404aca4b0274f6ecc99dd3ce0b