Change-Id: I6a057950315a1e2084fd6fc130007f865d096f12 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>