Merge "Fix const sp<>& in parameter list and return value"