Fix mismatching wfProfileIn / wfProfileOut calls

Change-Id: Ie1505be5fc5a61f95f5e1025fa7a53b8ef48427b
Merge "Fix mismatching wfProfileIn / wfProfileOut calls"