Merge "Bump mdsal to 3.0.5"