Merge "Clean up profman arg checking"
am: d8a16ba050

Change-Id: I6d3fdf459aa3371bd9200fddee8003679b8b3e59