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