Check in crypto patches for post 4.1 merge window