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