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

Change-Id: I9ee51e907ae6099008c8a9fcee48682d3b2493a8