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