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