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