Merge "Return a runtime error if decryption fails instead of asserting." into honeycomb