Merge "Fix memory leak in strdup(str_parms_to_str(..))" am: e846a39352 am: 5748384e5f am: 559363e587

Change-Id: Ie7366f086ab17a968006fdc1d68b76a2345a92eb