Merge "Add Cipher support to autodocs."