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