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