Merge "Fix potential memory leak in SomeArgs"
am: 8a71e01423

Change-Id: I007ff55f39a3239c530c30306409b498ac066801