Merge "msm:ipa3 dereferencing Null pointer and casting error fixes"