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: 145c4b60
Change-Id: I20142364c025eb32c74e33220544d664ff0f2b77