Merge "msm: Increase start voice command timeout"