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