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