Merge "Add more loggings to debug decryption issues"