Merge "Clean up profman arg checking" am: d8a16ba050
am: 2866efced8

Change-Id: Ic7210b6089ca63507cb6e4d3da8ddae2727aec3b