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