Merge "msm: Add timeout to read APR responses"