Edit addons

Change-Id: I6c0b5be7c4bdc386513f02071720eddc0497fe9c