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