Merge "Allow system server to record its own profile" into pi-dev