Merge "msm_shared: prepare crypto for next revision"