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