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