Merge "msm: pil: Handle reference counts correctly on boot failure" into msm-3.0