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