Merge "Update description of account_type" into ics-mr1