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