Change-Id: I407b2cf2e1d6efa627724e893ea425bb653cdc7a Reviewed-by: Leandro Melo <leandro.melo@nokia.com>