[505627] Refactor features Bug: 505627 Change-Id: Icde5a49b2ccc17b1aeb3c4347c53bae5d727f751 Signed-off-by: Thomas Guiu <thomas.guiu@soyatec.com>