Backport some changes from vector and fix echo badge
Change-Id: Ie0d1c1ca58f9c25911a769dbc29c94e04cab3870