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