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