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