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