Merge "msm_rq_stats: correct deferred timer return value" into msm-3.0