Change-Id: I9f909b2209eaf5e81b1475d87219ae63e2741075 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>