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