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