Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237
am: dd9c5674df

Change-Id: I1e3c26c8179cf6039d8ac801a9a4d6f6be59bbca