Merge "cryptoc: sync with upstream sources"