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