Merge "Add ETC_CARD_TYPE and ETC_CARD_STATUS" into sc-dev