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

Change-Id: I3e8c2c3f2e6cf0e119b1c6dcc1249096ea538e8c