Merge "Document extra account_types" into jb-mr2-dev