Change-Id: I4b7a3dbd58cb52f9c6245ed59be2b1be8c98f66d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>