Merge "Profcollect: Fix two issues flagged by lint"