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